Merge from mainline.
authorKatsumi Yamaoka <katsumi@flagship2>
Thu, 10 Jun 2010 11:34:20 +0000 (11:34 +0000)
committerKatsumi Yamaoka <katsumi@flagship2>
Thu, 10 Jun 2010 11:34:20 +0000 (11:34 +0000)

Trivial merge